Micron Document
🎖️GitЯра🎖️

Node / meshtastic / Meshtastic-Android / commits / 41e3686

Commit 41e368641b22d8a6bf0b265c0dac762909479da0

󰉖 Browse tree at this commit

Parents : 89311e1
Author : James Rich <2199651+jamesarich@users.noreply.github.com>
Signature : Signature validation error
Date : 2026-05-20T20:29:56-07:00
Committer : GitHub <noreply@github.com>
Date : 2026-05-20T22:29:56-05:00

fix(settings): remote admin always showed local node config (#5560)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Changes

4 files changed, 5 insertions(+), 11 deletions(-)

M feature/settings/src/commonMain/kotlin/org/meshtastic/feature/settings/navigation/SettingsNavigation.kt +1 -2
M feature/settings/src/commonMain/kotlin/org/meshtastic/feature/settings/radio/RadioConfigViewModel.kt +1 -4
M feature/settings/src/commonTest/kotlin/org/meshtastic/feature/settings/radio/ProfileRoundTripTest.kt +1 -2
M feature/settings/src/commonTest/kotlin/org/meshtastic/feature/settings/radio/RadioConfigViewModelTest.kt +2 -3

Diff

diff --git a/feature/settings/src/commonMain/kotlin/org/meshtastic/feature/settings/navigation/SettingsNavigation.kt b/feature/settings/src/commonMain/kotlin/org/meshtastic/feature/settings/navigation/SettingsNavigation.kt
index 18e2707bba..790b13f1fc 100644
--- a/feature/settings/src/commonMain/kotlin/org/meshtastic/feature/settings/navigation/SettingsNavigation.kt
+++ b/feature/settings/src/commonMain/kotlin/org/meshtastic/feature/settings/navigation/SettingsNavigation.kt
@@ -20,7 +20,6 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
-import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.lifecycle.compose.dropUnlessResumed
import androidx.navigation3.runtime.EntryProviderScope
@@ -80,7 +79,7 @@ fun getRadioConfigViewModel(backStack: NavBackStack<NavKey>, destNumOverride: In
backStack.lastOrNull { it is SettingsRoute.Settings }?.let { (it as SettingsRoute.Settings).destNum }
}
return koinViewModel<RadioConfigViewModel>(key = destNum?.toString()) {
- parametersOf(SavedStateHandle(mapOf("destNum" to destNum)))
+ parametersOf(destNum)
}
}

diff --git a/feature/settings/src/commonMain/kotlin/org/meshtastic/feature/settings/radio/RadioConfigViewModel.kt b/feature/settings/src/commonMain/kotlin/org/meshtastic/feature/settings/radio/RadioConfigViewModel.kt
index 991a27d97b..4b9fdcdd1b 100644
--- a/feature/settings/src/commonMain/kotlin/org/meshtastic/feature/settings/radio/RadioConfigViewModel.kt
+++ b/feature/settings/src/commonMain/kotlin/org/meshtastic/feature/settings/radio/RadioConfigViewModel.kt
@@ -16,7 +16,6 @@
*/
package org.meshtastic.feature.settings.radio
-import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import co.touchlab.kermit.Logger
@@ -115,7 +114,7 @@ data class RadioConfigState(
@KoinViewModel
@Suppress("LongParameterList")
open class RadioConfigViewModel(
- @InjectedParam savedStateHandle: SavedStateHandle,
+ @InjectedParam private val destNum: Int?,
private val radioConfigRepository: RadioConfigRepository,
private val packetRepository: PacketRepository,
private val serviceRepository: ServiceRepository,
@@ -184,8 +183,6 @@ open class RadioConfigViewModel(
_mqttProbeStatus.value = null
}
- private val destNum: Int? = savedStateHandle.get<Int>("destNum")
-
private val _destNode = MutableStateFlow<Node?>(null)
val destNode: StateFlow<Node?>
get() = _destNode

diff --git a/feature/settings/src/commonTest/kotlin/org/meshtastic/feature/settings/radio/ProfileRoundTripTest.kt b/feature/settings/src/commonTest/kotlin/org/meshtastic/feature/settings/radio/ProfileRoundTripTest.kt
index b01a9cad71..8990246bf9 100644
--- a/feature/settings/src/commonTest/kotlin/org/meshtastic/feature/settings/radio/ProfileRoundTripTest.kt
+++ b/feature/settings/src/commonTest/kotlin/org/meshtastic/feature/settings/radio/ProfileRoundTripTest.kt
@@ -16,7 +16,6 @@
*/
package org.meshtastic.feature.settings.radio
-import androidx.lifecycle.SavedStateHandle
import dev.mokkery.MockMode
import dev.mokkery.answering.returns
import dev.mokkery.every
@@ -117,7 +116,7 @@ class ProfileRoundTripTest {
viewModel =
RadioConfigViewModel(
- savedStateHandle = SavedStateHandle(),
+ destNum = null,
radioConfigRepository = radioConfigRepository,
packetRepository = packetRepository,
serviceRepository = serviceRepository,

diff --git a/feature/settings/src/commonTest/kotlin/org/meshtastic/feature/settings/radio/RadioConfigViewModelTest.kt b/feature/settings/src/commonTest/kotlin/org/meshtastic/feature/settings/radio/RadioConfigViewModelTest.kt
index fc944d7d63..0375d390f5 100644
--- a/feature/settings/src/commonTest/kotlin/org/meshtastic/feature/settings/radio/RadioConfigViewModelTest.kt
+++ b/feature/settings/src/commonTest/kotlin/org/meshtastic/feature/settings/radio/RadioConfigViewModelTest.kt
@@ -16,7 +16,6 @@
*/
package org.meshtastic.feature.settings.radio
-import androidx.lifecycle.SavedStateHandle
import app.cash.turbine.test
import dev.mokkery.MockMode
import dev.mokkery.answering.calls
@@ -140,7 +139,7 @@ class RadioConfigViewModelTest {
}
private fun createViewModel() = RadioConfigViewModel(
- savedStateHandle = SavedStateHandle(),
+ destNum = null,
radioConfigRepository = radioConfigRepository,
packetRepository = packetRepository,
serviceRepository = serviceRepository,
@@ -407,7 +406,7 @@ class RadioConfigViewModelTest {
nodeRepository.setNodes(listOf(node))
viewModel =
RadioConfigViewModel(
- savedStateHandle = SavedStateHandle(mapOf("destNum" to 456)),
+ destNum = 456,
radioConfigRepository = radioConfigRepository,
packetRepository = packetRepository,
serviceRepository = serviceRepository,

Served by rngit 1.5.0 - Generated in 0.09s